From ba1fb4b0a796b85c8841ac20e899676aa4d6d81c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 20 Nov 2015 20:32:42 -0500 Subject: [PATCH] HighContrast: use -gtk-icon-shadow The name icon-shadow has been deprecated and causes warnings. --- gtk/theme/HighContrast/_common.scss | 16 ++-- gtk/theme/HighContrast/_drawing.scss | 8 +- gtk/theme/HighContrast/gtk.css | 124 +++++++++++++-------------- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index d7e8a5154e..8f5965935e 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -56,7 +56,7 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); .background:backdrop { text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; color: lighten($fg_color,10%); background-color: $backdrop_bg_color; @@ -439,7 +439,7 @@ button { @extend %linked; } - .primary-toolbar & { icon-shadow: none; } // tango icons don't need added shadows + .primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need added shadows // .separator { // -GtkWidget-wide-separators: true; // } @@ -570,7 +570,7 @@ toolbar.inline-toolbar toolbutton { // .inline-toolbar.toolbar here for background-color: transparent; background-image: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } /* menu buttons */ @@ -753,12 +753,12 @@ combobox { &:insensitive { color: $insensitive_fg_color; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } &:backdrop { color: $backdrop_fg_color; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } &:backdrop:insensitive { color: $insensitive_fg_color; @@ -1417,7 +1417,7 @@ notebook { button { //tab close button border: 2px solid transparent; @extend %undecorated_button; - icon-shadow: none; + -gtk-icon-shadow: none; transition: none; color: transparentize($fg_color,0.7); &:hover { @@ -2555,7 +2555,7 @@ cursor-handle { outline-color: transparentize($osd_fg_color, 0.7); box-shadow: none; text-shadow: 0 1px black; - icon-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; &:backdrop { text-shadow: none; } button { @include button(osd); @@ -2581,7 +2581,7 @@ cursor-handle { (':checked:active', '-checked-active'), (':backdrop:checked', '-checked-backdrop') { .#{$w}#{$s} { - icon-shadow: none; + -gtk-icon-shadow: none; color: $osd_fg_color; } } diff --git a/gtk/theme/HighContrast/_drawing.scss b/gtk/theme/HighContrast/_drawing.scss index 374b37f669..6bbf987cdc 100644 --- a/gtk/theme/HighContrast/_drawing.scss +++ b/gtk/theme/HighContrast/_drawing.scss @@ -96,11 +96,11 @@ @if lightness($tc) < 50% { text-shadow: 0 1px $_bright; - icon-shadow: 0 1px $_bright; + -gtk-icon-shadow: 0 1px $_bright; } @else { text-shadow: 0 -1px $_dark; - icon-shadow: 0 -1px $_dark; + -gtk-icon-shadow: 0 -1px $_dark; } } @@ -166,7 +166,7 @@ border-color: $insensitive_borders_color; background-image: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } @else if $t==insensitive-active { // @@ -187,7 +187,7 @@ border-color: if($c!=$bg_color, $c, $backdrop_borders_color); background-image: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } @else if $t==backdrop-active { diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css index 93444b56b5..9e9f655eae 100644 --- a/gtk/theme/HighContrast/gtk.css +++ b/gtk/theme/HighContrast/gtk.css @@ -62,7 +62,7 @@ .background:backdrop { text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; color: #1a1a1a; background-color: #fff; } @@ -390,7 +390,7 @@ button { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, button.flat:backdrop:checked, button.sidebar-button:backdrop:checked { border-width: 2px; border-style: solid; @@ -420,7 +420,7 @@ button { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } button:insensitive:active, button:insensitive.flat:active, button.sidebar-button:insensitive:active { border-width: 2px; border-style: solid; @@ -489,7 +489,7 @@ button { border-color: #4a90d9; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } button.suggested-action:backdrop:insensitive { border-width: 2px; border-style: solid; @@ -505,7 +505,7 @@ button { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } button.destructive-action { border-width: 2px; border-style: solid; @@ -535,7 +535,7 @@ button { border-color: #ef2929; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } button.destructive-action:backdrop:insensitive { border-width: 2px; border-style: solid; @@ -551,7 +551,7 @@ button { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } button.image-button { padding: 8px; } button.text-button { @@ -560,7 +560,7 @@ button { border-radius: 2px; border-width: 1px; } .primary-toolbar button { - icon-shadow: none; } + -gtk-icon-shadow: none; } .inline-toolbar toolbutton > button { border-width: 2px; @@ -591,7 +591,7 @@ button { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } .inline-toolbar toolbutton > button:insensitive:active { border-width: 2px; border-style: solid; @@ -607,7 +607,7 @@ button { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } .inline-toolbar toolbutton > button:backdrop:active { border-width: 2px; border-style: solid; @@ -703,7 +703,7 @@ row.activatable:insensitive:checked, calendar.button, calendar.button:hover, cal background-color: transparent; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } /* menu buttons */ modelbutton.flat, @@ -820,7 +820,7 @@ spinbutton { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } spinbutton.vertical button:first-child:backdrop { border-width: 2px; border-style: solid; @@ -829,7 +829,7 @@ spinbutton { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } spinbutton.vertical button:last-child { border-width: 2px; border-style: solid; @@ -859,7 +859,7 @@ spinbutton { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } spinbutton.vertical button:last-child:backdrop { border-width: 2px; border-style: solid; @@ -868,7 +868,7 @@ spinbutton { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } spinbutton.vertical button:backdrop:insensitive { border-width: 2px; border-style: solid; @@ -894,15 +894,15 @@ combobox { -GtkComboBox-shadow-type: none; box-shadow: 0 1px #fff; text-shadow: 0 1px white; - icon-shadow: 0 1px white; } + -gtk-icon-shadow: 0 1px white; } combobox:insensitive { color: gray; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } combobox:backdrop { color: #000; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } combobox:backdrop:insensitive { color: gray; } combobox .menuitem { @@ -1034,7 +1034,7 @@ headerbar { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } .titlebar.selection-mode button:backdrop, headerbar.selection-mode button:backdrop { border-width: 2px; @@ -1044,7 +1044,7 @@ headerbar { border-color: #000; background-image: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-color: black; } .titlebar.selection-mode button:backdrop:insensitive, headerbar.selection-mode button:backdrop:insensitive { @@ -1087,7 +1087,7 @@ headerbar { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } .titlebar.selection-mode button.suggested-action:backdrop, headerbar.selection-mode button.suggested-action:backdrop { border-width: 2px; @@ -1097,7 +1097,7 @@ headerbar { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } .titlebar.selection-mode button.suggested-action:backdrop:insensitive, headerbar.selection-mode button.suggested-action:backdrop:insensitive { border-width: 2px; @@ -1559,7 +1559,7 @@ notebook { color: #000; } notebook tab button { border: 2px solid transparent; - icon-shadow: none; + -gtk-icon-shadow: none; transition: none; color: rgba(0, 0, 0, 0.3); } notebook tab button:hover { @@ -1708,7 +1708,7 @@ switch { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } switch slider:backdrop { border-width: 2px; border-style: solid; @@ -1717,7 +1717,7 @@ switch { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } switch slider:backdrop:active { border-color: #8d8d8d; } switch slider:backdrop:insensitive { @@ -2340,7 +2340,7 @@ messagedialog.csd { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } messagedialog.csd .dialog-action-area button:backdrop { border-width: 2px; border-style: solid; @@ -2349,7 +2349,7 @@ messagedialog.csd { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } messagedialog.csd .dialog-action-area button:backdrop:insensitive { border-width: 2px; border-style: solid; @@ -2386,7 +2386,7 @@ messagedialog.csd { border-color: #4a90d9; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive { border-width: 2px; border-style: solid; @@ -2402,7 +2402,7 @@ messagedialog.csd { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } messagedialog.csd .dialog-action-area button.destructive-action { border-width: 2px; border-style: solid; @@ -2432,7 +2432,7 @@ messagedialog.csd { border-color: #ef2929; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive { border-width: 2px; border-style: solid; @@ -2448,7 +2448,7 @@ messagedialog.csd { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:insensitive, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:insensitive, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive, messagedialog.csd .dialog-action-area button.suggested-action:insensitive, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive, messagedialog.csd .dialog-action-area button.destructive-action:insensitive { border-right-style: none; border-bottom-style: none; } @@ -2599,7 +2599,7 @@ infobar { border-color: gray; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } .info button:backdrop, .question button:backdrop, .warning button:backdrop, @@ -2611,7 +2611,7 @@ infobar { border-color: #000; background-image: none; text-shadow: none; - icon-shadow: none; } + -gtk-icon-shadow: none; } .info button:backdrop:insensitive, .question button:backdrop:insensitive, .warning button:backdrop:insensitive, @@ -2724,7 +2724,7 @@ colorswatch { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-width: 1px; color: gray; } colorswatch#add-color-button overlay { @@ -2786,7 +2786,7 @@ button.titlebutton { border-color: #8d8d8d; background-image: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-color: transparent; transition-property: border, box-shadow, color; } @@ -2839,7 +2839,7 @@ cursor-handle { outline-color: rgba(255, 255, 255, 0.3); box-shadow: none; text-shadow: 0 1px black; - icon-shadow: 0 1px black; } + -gtk-icon-shadow: 0 1px black; } .touch-selection:backdrop { text-shadow: none; } .touch-selection button { @@ -2873,80 +2873,80 @@ cursor-handle { border-width: 2px; border-style: solid; } .touch-selection .check { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:hover { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:active { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:insensitive { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:inconsistent { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:inconsistent:hover { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:inconsistent:selected { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:inconsistent:insensitive { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:checked { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:checked:insensitive { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:checked:hover { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:checked:active { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .check:backdrop:checked { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:hover { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:active { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:insensitive { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:inconsistent { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:inconsistent:hover { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:inconsistent:selected { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:inconsistent:insensitive { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:checked { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:checked:insensitive { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:checked:hover { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:checked:active { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } .touch-selection .radio:backdrop:checked { - icon-shadow: none; + -gtk-icon-shadow: none; color: #fff; } -- 2.30.2